merge trunk
authorKenichi Handa <handa@etlken>
Mon, 12 Jul 2010 02:28:50 +0000 (11:28 +0900)
committerKenichi Handa <handa@etlken>
Mon, 12 Jul 2010 02:28:50 +0000 (11:28 +0900)
commit48dfc6c7bcc7cc52ae48beccfbafab1bd98cd798
treede79a803c2763f4d88ddf996d5c3da4f4ca125ac
parent7223d9ec2fca93f58829f37356bdc7b231d4ca96
parentd73587239f6138913e9a44114dd4f4aa78d1bc3d
merge trunk
src/ChangeLog
src/font.c